MERGE(1) Unix Programmer's Manual MERGE(1) NNNAAAMMMEEE merge - three-way file merge SSSYYYNNNOOOPPPSSSIIISSS mmmeeerrrgggeee [ ---LLL _l_a_b_e_l_1 [ ---LLL _l_a_b_e_l_3 ] ] [ ---ppp ] [ ---qqq ] _f_i_l_e_1 _f_i_l_e_2 _f_i_l_e_3 DDDEEESSSCCCRRRIIIPPPTTTIIIOOONNN mmmeeerrrgggeee incorporates all changes that lead from _f_i_l_e_2 to _f_i_l_e_3 into _f_i_l_e_1. The result goes to standard output if ---ppp is present, into _f_i_l_e_1 otherwise. mmmeeerrrgggeee is useful for combining separate changes to an original. Suppose _f_i_l_e_2 is the original, and both _f_i_l_e_1 and _f_i_l_e_3 are modifications of _f_i_l_e_2. Then mmmeeerrrgggeee combines both changes. An overlap occurs if both _f_i_l_e_1 and _f_i_l_e_3 have changes in a common segment of lines. mmmeeerrrgggeee outputs a message if overlaps occurred, and includes both alternatives in the result. The alternatives are delimited as follows: <<<<<<<<<<<<<<<<<<<<< _f_i_l_e_1 _l_i_n_e_s _i_n _f_i_l_e_1 ===================== _l_i_n_e_s _i_n _f_i_l_e_3 >>>>>>>>>>>>>>>>>>>>> _f_i_l_e_3 If there are overlaps, the user should edit the result and delete one of the alternatives. If the ---LLL\ _l_a_b_e_l_1 and ---LLL\ _l_a_b_e_l_3 options are given, the labels are output in place of the names _f_i_l_e_1 and _f_i_l_e_3 in overlap reports. Any overlap message is suppressed if the ---qqq option is given. DDDIIIAAAGGGNNNOOOSSSTTTIIICCCSSS Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble. IIIDDDEEENNNTTTIIIFFFIIICCCAAATTTIIIOOONNN Author: Walter F. Tichy. Revision Number: 5.1; Release Date: 1990/08/29. Copyright (c) 1982, 1988, 1989 by Walter F. Tichy. Copyright (c) 1990 by Paul Eggert. SSSEEEEEE AAALLLSSSOOO diff3(1), diff(1), rcsmerge(1), co(1). \*(Dt 1